[3/N] feat(runway): add merge-conflict-check and merge controllers#251
Closed
kevinlnew wants to merge 6 commits into
Closed
[3/N] feat(runway): add merge-conflict-check and merge controllers#251kevinlnew wants to merge 6 commits into
kevinlnew wants to merge 6 commits into
Conversation
This was referenced Jun 16, 2026
kevinlnew
changed the title
kevinlnew
force-pushed
the
runway/vcs-extension
branch
from
05a53c0 to
7aa8d2d
Compare
kevinlnew
force-pushed
the
runway/controllers
branch
from
c75bbda to
74e13fa
Compare
kevinlnew
force-pushed
the
runway/vcs-extension
branch
from
7aa8d2d to
bf2831f
Compare
kevinlnew
force-pushed
the
runway/controllers
branch
from
74e13fa to
1595bde
Compare
Runway is a consumer-only landing service that owns VCS operations (mergeability checking and landing) on behalf of SubmitQueue. This RFC describes the two independent queue flows (check and land), branch serialization via partition key, statelessness, and ownership model. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Remove dangling pipe characters and empty lines inside diagram boxes that render as strikethroughs in GitHub rich diff. Change connector characters from cross (┼) to tee (┬) at box edges. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Remove historical context, implementation rationale, and defensive justifications. Match the factual tone and structure of the submitqueue and stovepipe workflow RFCs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Update queue names, entity names, and controller names to match the merge contract that landed in #244: merge-conflict-checker/merger topic keys, MergeRequest/MergeResult payloads, unified contract serving both dry-run checks and committing merges. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Two-method VCS interface (CheckMergeability + Land) consuming the landed MergeRequest/MergeResult contract. Noop impl for local development; generated mock for controller tests. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Two consumer controllers, one per operation: merge-conflict-check (dry-run, all errors nack) and merge (conflicts ack + publish failure result, infra errors nack). Both consume MergeRequest and publish MergeResult using the landed entity contract. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
kevinlnew
force-pushed
the
runway/vcs-extension
branch
from
bf2831f to
ac42742
Compare
kevinlnew
force-pushed
the
runway/controllers
branch
from
1595bde to
d3f8423
Compare
kevinlnew
changed the title
kevinlnew
force-pushed
the
runway/vcs-extension
branch
from
ac42742 to
ce022df
Compare
Contributor
Author
|
Superseded by #265 which landed the runway orchestrator controllers on main. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Implement the two queue message controllers for the runway orchestrator.
The check controller consumes Check messages, calls VCS.CheckMergeability,
and publishes CheckResult. The land controller consumes Job messages,
calls VCS.Land, and publishes Result — conflicts are acked, infra errors
are nacked. Both controllers are stateless (no storage dependency).
Co-Authored-By: Claude Opus 4.6 (1M context) noreply@anthropic.com
Test Plan
Issues
Stack